Abbreviations #1208
Abbreviations #1208
Conversation
…e able to delete entry FIX: Editing abbreviation entries does not create new entries but actually edits them
| val allAbbreviations: LiveData<List<Abbreviation>> = abbreviationDao.getAllAbbreviations() | ||
|
|
||
| @WorkerThread | ||
| suspend fun insertOrUpdate( |
There was a problem hiding this comment.
Did a search, and room now has an @Upsert : https://developer.android.com/reference/kotlin/androidx/room/Upsert?hl=en
| @@ -344,6 +344,34 @@ data class BehaviorUpdate( | |||
| val ghostKeysEnabled: Int, | |||
| ) | |||
|
|
|||
| @Dao | |||
There was a problem hiding this comment.
Might as well put all the abbreviation stuff in one file. So rename the AbbreviationRepository.kt above to Abbreviation, and move all this stuff in there.
| @Query("SELECT * FROM Abbreviation") | ||
| fun getAllAbbreviations(): LiveData<List<Abbreviation>> | ||
|
|
||
| @Query("SELECT * FROM Abbreviation WHERE lower(abbreviation) = lower(:abbr) LIMIT 1") |
There was a problem hiding this comment.
hrm... I'm not sure what the best way to handle case would be. I spose this is fine, but we should decide first whether we should allow upper case abbreviations at all, in which case it'd be better to add a table constraint.
| @Query("SELECT * FROM Abbreviation WHERE lower(abbreviation) = lower(:abbr) LIMIT 1") | ||
| fun getAbbreviation(abbr: String): Abbreviation? | ||
|
|
||
| @Query("SELECT * FROM Abbreviation WHERE lower(abbreviation) = lower(:abbr) LIMIT 1") |
There was a problem hiding this comment.
This query is duped, so you might as well make the string a const.
| fun getAbbreviation(abbr: String): Abbreviation? | ||
|
|
||
| @Query("SELECT * FROM Abbreviation WHERE lower(abbreviation) = lower(:abbr) LIMIT 1") | ||
| suspend fun getAbbreviationAsync(abbr: String): Abbreviation? |
There was a problem hiding this comment.
I'd prefer if async was the default, and change getAbbreviation to getAbbreviationSync. Seems like you'd never need either of these tho, I'll have to read further down.
EDIT: Actually both of these should be removed. All the abbrevations should only be read once as a list, and passed around as necessary.
|
|
||
| private const val ABBR_TAG = "AbbreviationManager" | ||
|
|
||
| class AbbreviationManager( |
There was a problem hiding this comment.
I don't understand the point of this at all. You should just be passing the AbbreviationViewModel to any screen that needs it, and reading the abbreviations at the top of that file.
| @@ -1107,13 +1139,18 @@ private fun autoCapitalize( | |||
| } | |||
| } | |||
|
|
|||
| fun autoCapitalizeCheck(ime: IMEService): Boolean = ime.currentInputConnection.getCursorCapsMode(ime.currentInputEditorInfo.inputType) > 0 | |||
| fun autoCapitalizeCheck(ime: IMEService): Boolean { | |||
|
|
||
| /** | ||
| * Avoid capitalizing or switching to shifted mode in certain edit boxes | ||
| */ | ||
| fun isUriOrEmailOrPasswordField(ime: IMEService): Boolean { | ||
| val inputType = ime.currentInputEditorInfo.inputType and (InputType.TYPE_MASK_VARIATION) | ||
| val editorInfo = ime.currentInputEditorInfo ?: return false |
| 1, | ||
| ) | ||
|
|
||
| if (text == " ") { |
There was a problem hiding this comment.
This should be extracted to its own function
| if (text == " ") { | ||
| val currentText = ime.currentInputConnection.getTextBeforeCursor(1000, 0)?.toString() | ||
| if (currentText != null) { | ||
| val abbreviationManager = AbbreviationManager(ime.applicationContext) |
There was a problem hiding this comment.
Not necessary. Pass in the abbreviations as List<Abbreviation> to performKeyAction.
|
i think this is great, however, it might not be desireable to always expand the abbreviation. what about only expanding it when swiping right on spacebar? (right arrow, or left arrow for rtl) it works similarly in browser autocomplete (brave for android) additionally, it might be a good idea to display in the ui somehow 1) that there is an expansion available if you type the trigger word 2) what the expansion is. you could use the android popup messages, but i find them quite unreliable on my device (don't always show up) |
This system allows you to add abbreviation for texts you use often.
For example if you type "gm" + space the texts gets replaced by "good morning".
Abbreviations can be edited from a new settings screen.
20241225_abbreviations.mp4